ngl: Consistently use gsk_scaled_premultiply

Its not going to make much of a difference, but we
can just as well be consistent.

diff --git a/gsk/ngl/resources/border.glsl b/gsk/ngl/resources/border.glsl
index a9c04556a4f950ef7e358621b1c96f0132f1eaee..4f47ab87dc8292414dd50d29f7015e00755d8ff3 100644 (file)
--- a/gsk/ngl/resources/border.glsl
+++ b/gsk/ngl/resources/border.glsl
@@ -11,7 +11,7 @@ _OUT_ _GSK_ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
 
-  final_color = gsk_premultiply(aColor) * u_alpha;
+  final_color = gsk_scaled_premultiply(aColor, u_alpha);
 
   GskRoundedRect outside = gsk_create_rect(u_outline_rect);
   GskRoundedRect inside = gsk_rounded_rect_shrink (outside, u_widths);

diff --git a/gsk/ngl/resources/color.glsl b/gsk/ngl/resources/color.glsl
index 670b9979a2cc5566be70c0d11cf99e83bad6baed..ba98b1b170798f87009b3cd0f182ed945f8b857b 100644 (file)
--- a/gsk/ngl/resources/color.glsl
+++ b/gsk/ngl/resources/color.glsl
@@ -6,7 +6,7 @@ _OUT_ vec4 final_color;
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
 
-  final_color = gsk_premultiply(aColor) * u_alpha;
+  final_color = gsk_scaled_premultiply(aColor, u_alpha);
 }
 
 // FRAGMENT_SHADER:

diff --git a/gsk/ngl/resources/color_matrix.glsl b/gsk/ngl/resources/color_matrix.glsl
index 44dcf9a044d882d335ba4ea597ad2a318ba79010..51835f056fa9c919051ae98ad716db2ea72091d8 100644 (file)
--- a/gsk/ngl/resources/color_matrix.glsl
+++ b/gsk/ngl/resources/color_matrix.glsl
@@ -23,7 +23,5 @@ void main() {
   color = u_color_matrix * color + u_color_offset;
   color = clamp(color, 0.0, 1.0);
 
-  color.rgb *= color.a;
-
-  gskSetOutputColor(color * u_alpha);
+  gskSetOutputColor(gsk_scaled_premultiply(color, u_alpha));
 }

diff --git a/gsk/ngl/resources/coloring.glsl b/gsk/ngl/resources/coloring.glsl
index 5b5d46a7328688df000f2e6f01682664ab51593f..15e8203b8a0963a72c126882fd928d2a17bdbaa3 100644 (file)
--- a/gsk/ngl/resources/coloring.glsl
+++ b/gsk/ngl/resources/coloring.glsl
@@ -17,7 +17,7 @@ void main() {
   else
     use_color = 1.0;
 
-  final_color = gsk_premultiply(aColor) * u_alpha;
+  final_color = gsk_scaled_premultiply(aColor, u_alpha);
 }
 
 // FRAGMENT_SHADER:

diff --git a/gsk/ngl/resources/inset_shadow.glsl b/gsk/ngl/resources/inset_shadow.glsl
index 1c3c95503523bd45d4e490b5e563d75ad73de4d2..8cff1edee17315d22e160f6cb6db61080a5b46f5 100644 (file)
--- a/gsk/ngl/resources/inset_shadow.glsl
+++ b/gsk/ngl/resources/inset_shadow.glsl
@@ -12,7 +12,7 @@ _OUT_ _GSK_ROUNDED_RECT_UNIFORM_ transformed_inside_outline;
 void main() {
   gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
 
-  final_color = gsk_premultiply(aColor) * u_alpha;
+  final_color = gsk_scaled_premultiply(aColor, u_alpha);
 
   GskRoundedRect outside = gsk_create_rect(u_outline_rect);
   GskRoundedRect inside = gsk_rounded_rect_shrink(outside, vec4(u_spread));

diff --git a/gsk/ngl/resources/outset_shadow.glsl b/gsk/ngl/resources/outset_shadow.glsl
index 427aee956cc00fb8325a683dac9a25b788fca600..0ab943b070491fbf771a7035e2f4d95941c96df7 100644 (file)
--- a/gsk/ngl/resources/outset_shadow.glsl
+++ b/gsk/ngl/resources/outset_shadow.glsl
@@ -11,7 +11,7 @@ void main() {
 
   vUv = vec2(aUv.x, aUv.y);
 
-  final_color = gsk_premultiply(aColor) * u_alpha;
+  final_color = gsk_scaled_premultiply(aColor, u_alpha);
 
   GskRoundedRect outline = gsk_create_rect(u_outline_rect);
   gsk_rounded_rect_transform(outline, u_modelview);